Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 17 Jun 2011 07:37:43 +0000 (00:37 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 17 Jun 2011 07:37:43 +0000 (00:37 -0700)
commitaae073e7e45457ad9c16cab5225f6c35d2ee6cb7
tree29289110424a6d70d3b343968d00983cba06470f
parent58dbc35b2838dbe302586343cb66db52aefaafdd
parent8054af40e46c6d9b2033ef74377f2fe99b1a0896
Merge from trunk.